Fixing the category key when loading proto files #332
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
There was a problem hiding this comment.
Full Diff
--- xml_converter/integration_tests/test_cases/display_name_valid/output_proto/markers.bin.textproto._old 2024-08-18 04:11:07.024577588 +0000
+++ xml_converter/integration_tests/test_cases/display_name_valid/output_proto/markers.bin.textproto._new 2024-08-18 04:11:07.032577619 +0000
@@ -0,0 +1,48 @@
+category {
+ name: "My Category"
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: "(\350\314\006\302\223^\226"
+}
+category {
+ name: "Nested Level One"
+ children {
+ name: "Nested Level Two"
+ children {
+ name: "Nested Level Three"
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: "p,T\324\205\337\210\244"
+ }
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: "\270\232\334\270\267xj\317"
+ }
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: ",\222\247\355j@\016:"
+}
There was a problem hiding this comment.
Full Diff
--- xml_converter/integration_tests/test_cases/proto_type_valid/input/pack/markers.bin.textproto._old 2024-08-18 04:11:07.076577796 +0000
+++ xml_converter/integration_tests/test_cases/proto_type_valid/input/pack/markers.bin.textproto._new 2024-08-18 04:11:07.084577829 +0000
@@ -0,0 +1,48 @@
+category {
+ name: "My Category"
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: "(\350\314\006\302\223^\226"
+}
+category {
+ name: "Nested Level One"
+ children {
+ name: "Nested Level Two"
+ children {
+ name: "Nested Level Three"
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: "p,T\324\205\337\210\244"
+ }
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: "\270\232\334\270\267xj\317"
+ }
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: ",\222\247\355j@\016:"
+}
There was a problem hiding this comment.
Full Diff
--- xml_converter/integration_tests/test_cases/proto_type_valid/output_proto/markers.bin.textproto._old 2024-08-18 04:11:07.092577861 +0000
+++ xml_converter/integration_tests/test_cases/proto_type_valid/output_proto/markers.bin.textproto._new 2024-08-18 04:11:07.100577892 +0000
@@ -0,0 +1,48 @@
+category {
+ name: "My Category"
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: "(\350\314\006\302\223^\226"
+}
+category {
+ name: "Nested Level One"
+ children {
+ name: "Nested Level Two"
+ children {
+ name: "Nested Level Three"
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: "p,T\324\205\337\210\244"
+ }
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: "\270\232\334\270\267xj\317"
+ }
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: ",\222\247\355j@\016:"
+}
There was a problem hiding this comment.
Full Diff
--- xml_converter/integration_tests/test_cases/display_name_valid/output_proto/markers.bin.textproto._old 2024-08-18 21:26:25.288712905 +0000
+++ xml_converter/integration_tests/test_cases/display_name_valid/output_proto/markers.bin.textproto._new 2024-08-18 21:26:25.296712852 +0000
@@ -0,0 +1,48 @@
+category {
+ name: "My Category"
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: "(\350\314\006\302\223^\226"
+}
+category {
+ name: "Nested Level One"
+ children {
+ name: "Nested Level Two"
+ children {
+ name: "Nested Level Three"
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: "p,T\324\205\337\210\244"
+ }
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: "\270\232\334\270\267xj\317"
+ }
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: ",\222\247\355j@\016:"
+}
There was a problem hiding this comment.
Full Diff
--- xml_converter/integration_tests/test_cases/proto_type_valid/input/pack/markers.bin.textproto._old 2024-08-18 21:26:25.304712800 +0000
+++ xml_converter/integration_tests/test_cases/proto_type_valid/input/pack/markers.bin.textproto._new 2024-08-18 21:26:25.312712750 +0000
@@ -0,0 +1,48 @@
+category {
+ name: "My Category"
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: "(\350\314\006\302\223^\226"
+}
+category {
+ name: "Nested Level One"
+ children {
+ name: "Nested Level Two"
+ children {
+ name: "Nested Level Three"
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: "p,T\324\205\337\210\244"
+ }
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: "\270\232\334\270\267xj\317"
+ }
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: ",\222\247\355j@\016:"
+}
There was a problem hiding this comment.
Full Diff
--- xml_converter/integration_tests/test_cases/proto_type_valid/output_proto/markers.bin.textproto._old 2024-08-18 21:26:25.320712697 +0000
+++ xml_converter/integration_tests/test_cases/proto_type_valid/output_proto/markers.bin.textproto._new 2024-08-18 21:26:25.328712645 +0000
@@ -0,0 +1,48 @@
+category {
+ name: "My Category"
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: "(\350\314\006\302\223^\226"
+}
+category {
+ name: "Nested Level One"
+ children {
+ name: "Nested Level Two"
+ children {
+ name: "Nested Level Three"
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: "p,T\324\205\337\210\244"
+ }
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: "\270\232\334\270\267xj\317"
+ }
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: ",\222\247\355j@\016:"
+}
klingbolt
approved these changes
Aug 19, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes the proto loading code to properly assign category names to the category children map. This was causing errors where no output was being written to proto files if the input was also proto files.
Also adding new tests
Also adding the ability to have proto file inputs to the test harness.